Skip to content

Conversation

pnkfelix
Copy link
Member

This is a step towards addressing #53764. Much still remains.

I went through a large portion of the *.rs files that were directly stored into src/test/run-pass/ and moved them into various subdirectories of a newly created src/test/ui/run-pass/.

(yes, it would have perhaps been nice to meld it more directly with directories already in src/test/ui/; but the sad truth is that opens up the reality of filename collisions, and one of my short term goals for resolving #53764 is to keep the filenames invariant, even as their parents directories and contents are mildly revised...)

@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2018
@pnkfelix
Copy link
Member Author

r? @nikomatsakis

@nikomatsakis
Copy link
Contributor

@bors r+

cc @rust-lang/compiler — seems like a notable change.

@petrochenkov
Copy link
Contributor

petrochenkov commented Aug 31, 2018

The directory collapsing part looks questionable to me.
As a user of hygiene/, imports/, macros/, etc, I can say that they are all useful and different, and this PR makes things worse for me specifically + these directory rearrangements are not entirely on-topic for this PR.
I'd prefer to leave directory grouping to people writing/maintaining specific groups of tests (or at least to come up with some convention document before making changes).

@nikomatsakis
Copy link
Contributor

@bors r-

@nikomatsakis
Copy link
Contributor

@petrochenkov

As a user of hygiene/, imports/, macros/, etc, I can say that they are all useful and different, and this PR makes things worse for me specifically + these directory rearrangements are not entirely on-topic for this PR.

I'm confused, perhaps. I thought that this PR preserved the existing run-pass directory structure, but made it a subpart of src/test/ui?

@nikomatsakis
Copy link
Contributor

Ah, I see, I missed the various "collapse" commits.

@pnkfelix
Copy link
Member Author

pnkfelix commented Sep 1, 2018

Hmm I thought my collapsing cases here still didn't destroy anything distinctions that were previously there.

That is, the directories being collapsed were ones that I created in earlier commits in the PR, and the source material ... always came solely from src/test/run-pass/*.rs, and none of its subdirectories .... (right? Or did I misremember and/or screw up somewhere?)

Having said that, I'm happy to drop some/all/any of the collapsing commits.

  • Update: at the very least, I misremembered, in that I did port over some directory structure. And its certainly possible that I subsequently collapsed them when I shouldn't have. So I can just kill off those commits.

@pnkfelix pnkfelix force-pushed the issue-53764-migrate-run-pass-to-ui branch 2 times, most recently from 1d01152 to 74a5aef Compare September 3, 2018 08:27
@pnkfelix
Copy link
Member Author

pnkfelix commented Sep 3, 2018

@bors r=nikomatsakis

@pnkfelix pnkfelix added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 3, 2018
@pnkfelix
Copy link
Member Author

pnkfelix commented Sep 3, 2018

@bors ping

@pietroalbini pietroalbini reopened this Sep 3, 2018
@pietroalbini
Copy link
Member

@bors are you still there?

@bors
Copy link
Collaborator

bors commented Sep 3, 2018

🍰 Target acquired

@pnkfelix
Copy link
Member Author

pnkfelix commented Sep 3, 2018

@bors r=nikomatsakis

@bors
Copy link
Collaborator

bors commented Sep 3, 2018

📌 Commit 74a5aef has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Sep 3, 2018

⌛ Testing commit 74a5aef with merge eb74017...

bors added a commit that referenced this pull request Sep 3, 2018
…=nikomatsakis

Migrate (some) of run-pass/ to ui

This is a step towards addressing #53764. Much still remains.

I went through a large portion of the `*.rs` files that were directly stored into `src/test/run-pass/` and moved them into various subdirectories of a newly created `src/test/ui/run-pass/`.

(yes, it would have perhaps been nice to meld it more directly with directories already in `src/test/ui/`; but the sad truth is that opens up the reality of filename collisions, and one of my short term goals for resolving #53764 is to keep the *filenames* invariant, even as their parents directories and contents are mildly revised...)
@bors
Copy link
Collaborator

bors commented Sep 3, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 3, 2018
@kennytm
Copy link
Member

kennytm commented Sep 4, 2018

Several these new UI tests generate integer overflow warnings on 32-bit platform e.g.

---- [ui] ui\run-pass\structs-enums\enum-discrim-width-stuff.rs stdout ----
normalized stderr:
warning: literal out of range for isize
  --> $DIR/enum-discrim-width-stuff.rs:40:20
   |
LL |     check!(f, u32, 0xe8d8c8b8);
   |                    ^^^^^^^^^^
   |
   = note: #[warn(overflowing_literals)] on by default
   = note: the literal `0xe8d8c8b8` (decimal `3906521272`) does not fit into an `isize` and will become `-388446024isize`

List of failures:

failures:
    [ui] ui\run-pass\array-slice-vec\box-of-array-of-drop-1.rs
    [ui] ui\run-pass\array-slice-vec\box-of-array-of-drop-2.rs
    [ui] ui\run-pass\array-slice-vec\nested-vec-3.rs
    [ui] ui\run-pass\consts\const-fn-val.rs
    [ui] ui\run-pass\deriving\deriving-hash.rs
    [ui] ui\run-pass\simd\simd-target-feature-mixup.rs
    [ui] ui\run-pass\structs-enums\enum-discrim-autosizing.rs
    [ui] ui\run-pass\structs-enums\enum-discrim-width-stuff.rs

(I may have accidentally added it to some auxilliary crates as well;
my emacs-macro-based methodology was pretty crude.)
…est seems bogus.

that is, I suspect it should be retired because it is testing behavior
(namely a `#[repr(C)] struct Empty;`) that, if I understand correctly,
is undefined.

See also rust-lang#53859.
That is, opting to ignore stable `#![feature(..)]`, under my theory
that a reviewer would prefer as much stuff to be bucketed under "ah
another `#![allow(..)]` here." as possible.
@pnkfelix pnkfelix force-pushed the issue-53764-migrate-run-pass-to-ui branch from 433032b to 5fe0851 Compare September 6, 2018 11:27
@pnkfelix
Copy link
Member Author

pnkfelix commented Sep 6, 2018

@bors r=nikomatsakis

@bors
Copy link
Collaborator

bors commented Sep 6, 2018

📌 Commit 5fe0851 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 6, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Sep 7, 2018
…ss-to-ui, r=nikomatsakis

Migrate (some) of run-pass/ to ui

This is a step towards addressing rust-lang#53764. Much still remains.

I went through a large portion of the `*.rs` files that were directly stored into `src/test/run-pass/` and moved them into various subdirectories of a newly created `src/test/ui/run-pass/`.

(yes, it would have perhaps been nice to meld it more directly with directories already in `src/test/ui/`; but the sad truth is that opens up the reality of filename collisions, and one of my short term goals for resolving rust-lang#53764 is to keep the *filenames* invariant, even as their parents directories and contents are mildly revised...)
bors added a commit that referenced this pull request Sep 7, 2018
Rollup of 17 pull requests

Successful merges:

 - #53299 (Updated core/macros.rs to note it works in a no_std environment.)
 - #53376 (Cross reference io::copy and fs::copy in docs.)
 - #53455 (Individual docs for {from,to}_*_bytes)
 - #53550 (librustc_lint: In recursion warning, change 'recurring' to 'recursing')
 - #53860 (Migrate (some) of run-pass/ to ui)
 - #53874 (Implement Unpin for Box, Rc, and Arc)
 - #53895 (tidy: Cleanups and clippy warning fixes)
 - #53946 (Clarify `ManuallyDrop` docs)
 - #53948 (Minimized clippy test from when NLL disabled two-phase borrows)
 - #53959 (Add .git extension to submodule paths missing it)
 - #53966 (A few cleanups and minor improvements to mir/dataflow)
 - #53967 (propagate build.python into cmake)
 - #53979 (Remove `#[repr(transparent)]` from atomics)
 - #53991 (Add unchecked_shl/shr check for intrinsics to fix miri's test suit)
 - #53992 (migrate run-pass/borrowck to ui/run-pass)
 - #53994 (migrate run-pass/*/ to ui/run-pass)
 - #54023 (update clippy submodule)
@bors bors merged commit 5fe0851 into rust-lang:master Sep 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants